From 7d659b21e6a8abf098b7114427d9da1f4cf49e18 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 29 Dec 2017 13:13:36 -0500
Subject: [PATCH] Drop deprecated text view layers

These have been marked as deprecated, so lets drop them.
---
 gtk/gtktextview.c    | 8 --------
 gtk/gtktextview.h    | 4 ----
 tests/testtextview.c | 2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index c1573b4eff..1a9cae967d 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -5529,10 +5529,6 @@ draw_text (GtkWidget *widget,
 
   if (GTK_TEXT_VIEW_GET_CLASS (text_view)->draw_layer != NULL)
     {
-      cairo_save (cr);
-      GTK_TEXT_VIEW_GET_CLASS (text_view)->draw_layer (text_view, GTK_TEXT_VIEW_LAYER_BELOW, cr);
-      cairo_restore (cr);
-
       cairo_save (cr);
       cairo_translate (cr, -priv->xoffset, -priv->yoffset);
       GTK_TEXT_VIEW_GET_CLASS (text_view)->draw_layer (text_view, GTK_TEXT_VIEW_LAYER_BELOW_TEXT, cr);
@@ -5543,10 +5539,6 @@ draw_text (GtkWidget *widget,
 
   if (GTK_TEXT_VIEW_GET_CLASS (text_view)->draw_layer != NULL)
     {
-      cairo_save (cr);
-      GTK_TEXT_VIEW_GET_CLASS (text_view)->draw_layer (text_view, GTK_TEXT_VIEW_LAYER_ABOVE, cr);
-      cairo_restore (cr);
-
       cairo_save (cr);
       cairo_translate (cr, -priv->xoffset, -priv->yoffset);
       GTK_TEXT_VIEW_GET_CLASS (text_view)->draw_layer (text_view, GTK_TEXT_VIEW_LAYER_ABOVE_TEXT, cr);
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index 8cfe231de5..9881e4c983 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -68,8 +68,6 @@ typedef enum
 
 /**
  * GtkTextViewLayer:
- * @GTK_TEXT_VIEW_LAYER_BELOW: Old deprecated layer, use %GTK_TEXT_VIEW_LAYER_BELOW_TEXT instead
- * @GTK_TEXT_VIEW_LAYER_ABOVE: Old deprecated layer, use %GTK_TEXT_VIEW_LAYER_ABOVE_TEXT instead
  * @GTK_TEXT_VIEW_LAYER_BELOW_TEXT: The layer rendered below the text (but above the background).  Since: 3.20
  * @GTK_TEXT_VIEW_LAYER_ABOVE_TEXT: The layer rendered above the text.  Since: 3.20
  *
@@ -78,8 +76,6 @@ typedef enum
  */
 typedef enum
 {
-  GTK_TEXT_VIEW_LAYER_BELOW,
-  GTK_TEXT_VIEW_LAYER_ABOVE,
   GTK_TEXT_VIEW_LAYER_BELOW_TEXT,
   GTK_TEXT_VIEW_LAYER_ABOVE_TEXT
 } GtkTextViewLayer;
diff --git a/tests/testtextview.c b/tests/testtextview.c
index e6d74b9f5e..793f162952 100644
--- a/tests/testtextview.c
+++ b/tests/testtextview.c
@@ -24,7 +24,7 @@ static void my_text_view_draw_layer (GtkTextView       *textview,
 				     GtkTextViewLayer   layer,
 				     cairo_t           *cr)
 {
-  if (layer == GTK_TEXT_VIEW_LAYER_BELOW)
+  if (layer == GTK_TEXT_VIEW_LAYER_BELOW_TEXT)
     draw_background (GTK_WIDGET (textview), cr);
 }
 
-- 
2.30.2